[CR] Possibility to fix experimental cyborgs at Rubic's Castle #74054

Vgoloshivskiy · 2024-05-24T19:28:29Z

Added possibility to fix cyborgs at Rubic's

Summary

Content "Added a way to fix cyborgs at rubic's castle"

Purpose of change

Add easier way to fix cyborgs,
I could do it

In future hopefully before stable 0.H it would be possible to add mission to rescue desparete Hub-01 mercenary who got themselves a bionic through Doc or autodoc and ended up as prototype Cyborg (for example mercenary had alergies to a lot of food or had astma).
This is a way to help them but also push a bit conflict with exodii a bit closer.

Describe the solution

Added dialogs and a bit of other content in order for this to work
spawned npc should be of hub-01 mrecenary faction

Describe alternatives you've considered

This is new content so i didn't think about them

Testing

Run in dev mode to Rubic with ton of items for selling and inactive bodies and tried saving them -> NPC spawned -> but they probably gonna need some new dialog options;

Additional context

I'm not a native english speaker so i have no idea is my grammar correct or no I will be checking it right now.
It also need translation in Rubic's language cause i have no idea how to make it passable for language

Added possibility to fix cyborgs at Rubic's

I-am-Erk · 2024-05-24T19:51:30Z

This is one I should take a look at personally. I'm pretty busy but I'll try to get on it over the next few days. I'm moving it to draft so that I can do that. Looks exciting though!

Vgoloshivskiy · 2024-05-24T19:55:53Z

Do what you must, after my pull requests will be merged i will try to create mission.

data/json/npcs/classes.json

data/json/npcs/exodii/exodii_merchant_talk.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

data/json/npcs/exodii/exodii_merchant_talk.json

Vgoloshivskiy · 2024-05-25T11:00:34Z

I think crucial bit is to add mission to return them to the hub so they can pay you from their stash (payment should be oblivious to the player and can be everything from hub coins and nanofab templates to somesing exotic like artifacts or location of undiscovered dungeon)

github-actions · 2024-06-24T12:40:17Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

RenechCDDA · 2024-06-24T20:03:38Z

I know Erk isn't going to have any time in the near future, so I'm going to go ahead and put this back to ready for review. Sorry about the holdup.

data/json/npcs/classes.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Vgoloshivskiy · 2024-06-28T15:29:23Z

There are some failing checks but i m honestly not sure are they related to me or not. I used ChatGpt For Rubic translated text as writing dialogue in non-existing language is something that i m too afraid to do

Maleclypse

The CBMs I cut are all uniques that should only be spawning nether labyrinths. I also changed faction to your followers after surgery. This is looking fairly good to go though once those changes commit.

data/json/npcs/exodii/exodii_merchant_itemlist.json

data/json/npcs/exodii/exodii_merchant_talk.json

data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/NPC_BEMS.json

kevingranade

I used ChatGpt For Rubic translated text as writing dialogue in non-existing language is something that i m too afraid to do

Please pull the ChatGPT produced content back out. ChatGPT is a copyright infringing tool we want nothing to do with.
By submitting changes you are asserting that you wrote it, if you can't make that assertion, don't submit it.

Zireael07 · 2024-07-23T17:46:00Z

To add what Kevin said, it's also highly likely that ChatGPT gave you a mix of existing languages instead of what you wanted.

Vgoloshivskiy · 2024-07-23T23:04:57Z

I used ChatGpt For Rubic translated text as writing dialogue in non-existing language is something that i m too afraid to do

Please pull the ChatGPT produced content back out. ChatGPT is a copyright infringing tool we want nothing to do with. By submitting changes you are asserting that you wrote it, if you can't make that assertion, don't submit it.

Will do tommorow can't right now

…thub.com/Vgoloshivskiy/Cataclysm-DDA into Easy-experimental-cyborg-recovery/rescue

Vgoloshivskiy · 2024-07-25T12:09:49Z

I used ChatGpt For Rubic translated text as writing dialogue in non-existing language is something that i m too afraid to do

Please pull the ChatGPT produced content back out. ChatGPT is a copyright infringing tool we want nothing to do with. By submitting changes you are asserting that you wrote it, if you can't make that assertion, don't submit it.

Will do tommorow can't right now

Done

github-actions · 2024-07-25T12:11:16Z

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand

Fer this 'un, I can yank out their bits 'n give 'em to ya, or I can jus' take out the busted pieces so they can still use th' rest o' stuff in 'em. Elsewise, why don't ya jest give 'im to me? I reckon I can turn 'im into a right useful worker.
Gimme spek, 'n fetch 'em 'ere.
Nah, mate, still operatin
Rubic leads a person to you.
This 'unwon't be twitching', too much grey lost to dead. But ye can salvage bits from 'em or born 'em for a walker, or just cut out the rot 'n grey link so ya can miss 'em proper.
[Broken Cyborg] Can you save my buddy who looks a bit rough around the edges, but they still haven't flatlined?

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary

If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

data/json/npcs/exodii/exodii_merchant_itemlist.json

data/json/npcs/classes.json

Audit CBMs in prototype cyborg recovery.

data/json/npcs/classes.json

data/json/npcs/exodii/exodii_merchant_talk.json

Vgoloshivskiy added 2 commits May 24, 2024 21:18

EasyFixCyborgs

6525906

Added possibility to fix cyborgs at Rubic's

grammar fix

4081f99

I-am-Erk marked this pull request as draft May 24, 2024 19:51

github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON labels May 24, 2024

github-actions bot reviewed May 24, 2024

View reviewed changes

Vgoloshivskiy and others added 3 commits May 24, 2024 23:19

Update data/json/npcs/classes.json

5bd8649

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update data/json/npcs/exodii/exodii_merchant_talk.json

c557aa9

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Apply suggestions from code review

85e5d7e

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot added the astyled astyled PR, label is assigned by github actions label May 24, 2024

fix json with autoformatter

d311dcf

github-actions bot added the json-styled JSON lint passed, label assigned by github actions label May 24, 2024

RenechCDDA reviewed May 24, 2024

View reviewed changes

data/json/npcs/exodii/exodii_merchant_talk.json Outdated Show resolved Hide resolved

github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 24, 2024

Changed to item group list

c58865c

github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label May 25, 2024

lint

fedfc53

github-actions bot added the json-styled JSON lint passed, label assigned by github actions label May 25, 2024

github-actions bot added the stale Closed for lack of activity, but still valid. label Jun 24, 2024

RenechCDDA marked this pull request as ready for review June 24, 2024 20:03

github-actions bot removed the stale Closed for lack of activity, but still valid. label Jun 24, 2024

kevingranade reviewed Jun 25, 2024

View reviewed changes

data/json/npcs/classes.json Outdated Show resolved Hide resolved

resolve comment issue + some translation

331c1b4

github-actions bot removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 28, 2024

Update data/json/npcs/exodii/exodii_merchant_talk.json

6176330

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jun 28, 2024

fix i think

19fd55a

github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 21, 2024

Maleclypse reviewed Jul 22, 2024

View reviewed changes

Apply suggestions from code review

9ae6a08

kevingranade requested changes Jul 23, 2024

View reviewed changes

Vgoloshivskiy added 2 commits July 25, 2024 15:07

fix text

c0cd467

Merge branch 'Easy-experimental-cyborg-recovery/rescue' of https://gi…

c5a2d69

…thub.com/Vgoloshivskiy/Cataclysm-DDA into Easy-experimental-cyborg-recovery/rescue

kevingranade reviewed Jul 25, 2024

View reviewed changes

data/json/npcs/exodii/exodii_merchant_itemlist.json Outdated Show resolved Hide resolved

kevingranade reviewed Jul 25, 2024

View reviewed changes

data/json/npcs/classes.json Outdated Show resolved Hide resolved

Apply suggestions from code review

c16f03b

Audit CBMs in prototype cyborg recovery.

github-actions bot removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 25, 2024

Maleclypse reviewed Jul 26, 2024

View reviewed changes

data/json/npcs/classes.json Outdated Show resolved Hide resolved

Update data/json/npcs/classes.json

546add0

github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 26, 2024

Vgoloshivskiy requested a review from kevingranade July 26, 2024 18:40

Maleclypse reviewed Aug 13, 2024

View reviewed changes

data/json/npcs/exodii/exodii_merchant_talk.json Outdated Show resolved Hide resolved

Apply suggestions from code review

57d1714

github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 13, 2024

Maleclypse merged commit b84853d into CleverRaven:master Aug 17, 2024
25 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CR] Possibility to fix experimental cyborgs at Rubic's Castle #74054

[CR] Possibility to fix experimental cyborgs at Rubic's Castle #74054

Vgoloshivskiy commented May 24, 2024

I-am-Erk commented May 24, 2024

Vgoloshivskiy commented May 24, 2024 •

edited

Loading

Vgoloshivskiy commented May 25, 2024

github-actions bot commented Jun 24, 2024

RenechCDDA commented Jun 24, 2024

Vgoloshivskiy commented Jun 28, 2024

Maleclypse left a comment

kevingranade left a comment

Zireael07 commented Jul 23, 2024

Vgoloshivskiy commented Jul 23, 2024

Vgoloshivskiy commented Jul 25, 2024

github-actions bot commented Jul 25, 2024

[CR] Possibility to fix experimental cyborgs at Rubic's Castle #74054

[CR] Possibility to fix experimental cyborgs at Rubic's Castle #74054

Conversation

Vgoloshivskiy commented May 24, 2024

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

I-am-Erk commented May 24, 2024

Vgoloshivskiy commented May 24, 2024 • edited Loading

Vgoloshivskiy commented May 25, 2024

github-actions bot commented Jun 24, 2024

RenechCDDA commented Jun 24, 2024

Vgoloshivskiy commented Jun 28, 2024

Maleclypse left a comment

Choose a reason for hiding this comment

kevingranade left a comment

Choose a reason for hiding this comment

Zireael07 commented Jul 23, 2024

Vgoloshivskiy commented Jul 23, 2024

Vgoloshivskiy commented Jul 25, 2024

github-actions bot commented Jul 25, 2024

Vgoloshivskiy commented May 24, 2024 •

edited

Loading